Patches from Carlo E. Prelz <fluido@fluido.as> Now gtkfb at least compiles

2002-03-20  Alex Larsson  <alexl@redhat.com>

	Patches from Carlo E. Prelz <fluido@fluido.as>
	Now gtkfb at least compiles and mostly works. The keyboard
	stuff needs more loving.

	* gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
	xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
	At least set the out parameters for these calls.

	* gdk/linux-fb/gdkmain-fb.c:
	(gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
	Implement new functions.

diff --git a/ChangeLog b/ChangeLog
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ef98e26272859e288620bdf101e962e9d2e602f..73851b182e3fe7ec18b079221dc4ce234dfff123 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,17 @@
+2002-03-20  Alex Larsson  <alexl@redhat.com>
+
+       Patches from Carlo E. Prelz <fluido@fluido.as>
+       Now gtkfb at least compiles and mostly works. The keyboard
+       stuff needs more loving.
+       
+       * gdk/linux-fb/gdkkeyboard-fb.c (xlate_get_for_keyval,
+       xlate_get_for_keycode, raw_get_for_keyval, raw_get_for_keycode):
+       At least set the out parameters for these calls.
+
+       * gdk/linux-fb/gdkmain-fb.c:
+       (gdk_pointer_grab_info_libgtk_only, gdk_keyboard_grab_info_libgtk_only):
+       Implement new functions.
+       
 Wed Mar 20 19:00:03 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_set_text): Short-circuit

diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c
index 625d516c9cc1c9af7de7c41204fb57b96aed66db..272ba6b8939d1806a088187035583b01c9c1d0f0 100644 (file)
--- a/gdk/linux-fb/gdkkeyboard-fb.c
+++ b/gdk/linux-fb/gdkkeyboard-fb.c
@@ -947,6 +947,8 @@ xlate_get_for_keyval (GdkFBKeyboard       *kb,
                      gint                *n_keys)
 {
   g_warning ("xlate_get_for_keyval() NIY");
+  *keys=NULL;
+  *n_keys=0;
   return FALSE;
 }
 
@@ -958,6 +960,8 @@ xlate_get_for_keycode (GdkFBKeyboard       *kb,
                       gint                *n_entries)
 {
   g_warning ("xlate_get_for_keycode() NIY");
+  *keys=NULL;
+  *n_entries=0;
   return FALSE;
 }
 
@@ -1458,6 +1462,8 @@ raw_get_for_keyval (GdkFBKeyboard       *kb,
                      gint                *n_keys)
 {
   g_warning ("raw_get_for_keyval() NIY");
+  *keys=NULL;
+  *n_keys=0;
   return FALSE;
 }
 
@@ -1469,5 +1475,7 @@ raw_get_for_keycode (GdkFBKeyboard       *kb,
                       gint                *n_entries)
 {
   g_warning ("raw_get_for_keycode() NIY");
+  *keys=NULL;
+  *n_entries=0;
   return FALSE;
 }

diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c
index 372f80c76b07b3e45def7f16675e7cc48c735ff2..5477fa7301f3ac358f63037878c2922c8d75b96d 100644 (file)
--- a/gdk/linux-fb/gdkmain-fb.c
+++ b/gdk/linux-fb/gdkmain-fb.c
@@ -1072,6 +1072,41 @@ gdk_keyboard_ungrab (guint32 time)
   _gdk_fb_keyboard_grab_window = NULL;
 }
 
+gboolean
+gdk_pointer_grab_info_libgtk_only (GdkWindow **grab_window,
+                                  gboolean   *owner_events)
+{
+  if (_gdk_fb_pointer_grab_window)
+    {
+      if (grab_window)
+        *grab_window = (GdkWindow *)_gdk_fb_pointer_grab_window;
+      if (owner_events)
+        *owner_events = _gdk_fb_pointer_grab_owner_events;
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+gboolean
+gdk_keyboard_grab_info_libgtk_only (GdkWindow **grab_window,
+                                   gboolean   *owner_events)
+{
+  if (_gdk_fb_keyboard_grab_window)
+    {
+      if (grab_window)
+        *grab_window = (GdkWindow *)_gdk_fb_keyboard_grab_window;
+      if (owner_events)
+        *owner_events = _gdk_fb_keyboard_grab_owner_events;
+
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+
 /*
  *--------------------------------------------------------------
  * gdk_screen_width